Fixing some stuff for heroku