Minor changes for app.config support