Moderate performance enhancements