Fix deployment issues with heroku