Updates after some testing on Heroku