Couple of enhancements