Fixed performance issues - again.