More attempts at making heroku happy