Reverse push of a few tweaks to the migrations