Music bugs fixes