pulled in small util changes