Some template tweaks to run list