scalability fixes