Further improvements to recording.