collect() fixes