Fixing busted packages in collect module