A few enhancements