More fixes to heroku migration