fixes for recording and playback