Fix more bugs...