Changing stuff for heroku compatibility