Improvements to Utils