Fix issues with MediaPlayer