Minor changes for machine switch