Song formatting fixes