Fifth set of various minor enhancements