More fixes and enhancements.