Minor updates for optimal cluster performance.