#86057: Fixes for build of MONITOR code