Fixes to machine def