- Minor performance enhancements