A few tweaks for heroku support