More compilation errors correction