- Minor fixes and enhancements.