Fix object/json type mapping