Minor changes for performance.