A Couple Performance Enhancements