M38 fixes

SSIA