Fix more things.