merge fixes from Json archiver