Bug fixes and enhancements.