Some quick fixes for heroku