more tweaking for heroku migration