Fix a couple of minor glitches in M0 model/tools.

Reported by Brian Campbell.