Changes to attempt to solve issues with some bad audio encodings.

Didn't work.
Fix selecting incorrect audio track which was making a big issues.