Bug fixes... minor enhancements.