Libs/JSON: More fixes