Scalability fixes