Minor utility enhancements