Improve flags conflicting with -M section

Improved and cleaned up.