Fix more compatibility issues.