Some minor enhancements.