Scalability fixes +