Last template minor fixes.