Deploy to Heroku and fix some errors