Some mini-enhancements