mode switch fixes