Fix more templates

+ related stuff.

Change-Id: Idba86de2303985a4727dcf44eb6aebb06c22ee3f