Updates to util scripts