Fixing compilation errors