386.11 More alignment of canonical_machine