Various fixes and PVR integration