PVR fixes