Minor changes to help get onto Heroku