Fix more stuff (squash into first)