Fixes in support of song breakup code