Please pull these two minor enhancements