More music fixes