Enhance measurement system support in routing manager

Plus a couple of other minor changes.