Some small cleanup of vaious templates