fix issues on heroku