more fixes to the compilation code