Fixed issues with performance.