Fix more namespace errors.