updated fixes for heroku