Fix switches