Couple of performance enhancements