General utility enhancements