g2: Fix build
g2: Audio fixes

I forgot to add those thing after revert audio variant to CM one.