Fix up the recording flow a bit.