Backporting some fixes from master, no more annoying feedback when recording