minor behavior enhancements