Few util changes