Some templates improvments.