Fix calls to findSong