Heroku and minor fixes