Improved `finishRecording`