heroku compatibility improved