Fix more scalability issues