adding some fixes for heroku