Some minor enhancements