minor fixes for gathering