Minor Changes for Heroku