Fix ZTS issues