Minor chages in scaleout