Fix some regression bugs affecting parsing and procedural song changes from clicks