Quick hacks to fix compilation errors