More heroku migration fixes