more gather fixes