Major template and concat fixes everywhere