Minor performance enhancements