more compilation errors fixed