Changes to fix Heroku build