Tiny fixes around machines