Fixing up for heroku