Legacy data and template tweaks