Fixing a couple of merge problems including vcr cassettes.