o.c.opibuilder.pvmanager.util: Adapted to pvmanager changes