Fixing compilation issues.