Fix more namespace issues.