more template fixes

again