Fix more bugs..