Minor fixes and enhancements.