Fix tz custom builds