fix OsdMash to catch up with some of the 1.2 code refactoring - thanks Sheng for digging this one up.

fixes #178