Fixed various music player problems

including #3360