Fixes to new collector