Some more fixes for heroku