Second attempt at fixing vcr warnings