various bugfixes that were exposed in VCIS and Monitoring