1. Upgraded to latest version of T4Include
1. Fixed some compilation errors