More minor enhancements