Template fixes as requested