Minor changs to the templates