Recording fixups

These are some fixes for issues that I've found when stress-testing the recording scripts over a suite of old test recordings.