Small changes for performance.