More improvements for collector.