fix compilation errors part 2