Small enhancements
Merge