Another set of various minor enhancements