Some more polishing of template