Template fixes

Fixed some errors in the templates I stumbled upon.