collector fixes.#3322