Improved performance issues.