Contrib T4 some fixes

Soame t4 fixes