Fix sound/soc after merge