More OT_PVW work