minor fixes

in templates