Fixed some items for heroku deployment