Pioneer template tweaks