Fix more stupid problems.