Updated config handling to behave better with Heroku