Fixes to deploy onto heroku