Fix various template issues

Change-Id: I4d99a3f7dfbec0cc2214cb833278e5bb003b7739