Adjustments for some changes in gatherer layout