Third set of various minor enhancements