Misc template fixes

A few misc template fixes