A number of minor enhancements.