Several small enhancements.