Some fixes with HAR collector