Minor tweaks to support tracks and songs.