Fixed more compilation errors