Feature/appconfig fixes