some util changes