More fix to heroku migration