Attempt to fix performance issues.