Fix more broken migrations