Some extra tweaks to SCSwitchable