Fix even more compilation errors.