Seems I didn't actually fix the shrink-to-fit before. Works now. Panic over.
Couple of minor tweaks.