A few more AppConfig related fixes