Fixes to fixture recording