more fixes to deploy on heroku