Polish fixes.

Polish M18 fixes thanks to #Dust2Dust.