Still fixing compilation errors