Minor changes to Song.