fix project after the last merge

After the recent merge, the whole project has a lot of errors