Couple of minor enhancements