more APP_CONFIG related corrections