Fix scalability issues.