Fixes and enhancements
Bug fixes and enhancements.