Imported randys changes to speex