Fixes for sound/soc/codecs after merge