Slight improvements to init song scan