Various fixes (sorry music_dev)