Fixed some stuff for heroku