minor templates changes