Compilation errors adjusted