Fix up to match master
Fix missing audio formats