Small Fixes to Machines.