ZTS build fixes
ZTS fixes