two small enhancements