Fixed issues with Weaver indexing.  Updated some T4 templates.

All 575u tests pass.