Fixing a few compilation errors