Integrated with temporary ogg and vorbis fix