Changes to get scatter-gather passing tests