Wip 4521 - OSDMonitor fix

Just the OSDMonitor fix -- no tool.