More fixes to recording...