Pvr fixes