A few small enhancements.