many fixes to hybrid collector