Minor fixes for heroku, closes issue #2