Fixes for music player