more collector fixes