more template fixes

Change-Id: Ie814bed9feb2835209ea070fc9e613339c98b986