Fixing the compilation errors