fix heroku related bugs