Fixes to future recordings