misc enhancement during scalability test