DVR-fixes