A couple other minor enhancements.