adding further fixes for Heroku