Fix issues with things not running after changing to switch