Add minor performance enhancements