More fixes to the new recording/editing functionality...