Fixes for app config