firmware-json-fix improvements master