Fixes in order to compile wverything