One more template fix.
More template fixes.