Fix some more compilation errors