Fixed remaining compilation issues