Fixed remaining compilation issues.