*8094* Fix template discrepancies