Fix some problems with song scanning.