More fixes to heroku migrations