dieter: collector fixes