More Template Fixes!