fix some races for recording