Compilation errors fixed