Fixup some more FIQ/Sound related things and take the advice of @fdetro