Smaller performance enhancements