Small changes to switch machines