Revert "M: warning fixes"

This reverts commit c3438e0a16254d669ed5720c483a1e034993d03c.