More VCR fixes