fixes + vcr