Hendrik Leppkes:
	- Fixes for changed Gatherer API
