DVR Fixes