Some fixes to the recording process.