Fixing some issues when recording.