Further heroku compliancy