Fix more bugs.