Fixes to build the whole project