heroku deployment related fixes