minor fixes and improvements in generic_collector