M3 small fixes
V6-Crematoria by rubberduck and cryham