Fixed bugs in Jukebox