Collector fixes