Fourth set of various minor enhancements