Fixed Issues on pivi.T

Same patch except I merge in the recent changes to build process to test it.