More tweaks on master to fix Heroku migration problem