Fixed Heroku configuration + bugfix