fixes, Heroku adaptation