Fix more stuff left over