Some template tune-ups