feature switch fixes