Fixing stuff for heroku