Add changes missing from last commit for M4 support...