Fixing healthmonitor failures during build