gathering fixes