Small enhancements