A couple useability enhancements.