switch fixes