Fix ZEN-10187 and updates for util scripts...