Minor changes to machines