diff --git a/client/tinycbor/cbor.h b/client/tinycbor/cbor.h
index a6175d3ab..238a2717f 100644
--- a/client/tinycbor/cbor.h
+++ b/client/tinycbor/cbor.h
@@ -409,7 +409,7 @@ CBOR_PRIVATE_API CborError _cbor_value_copy_string(const CborValue *value, void
 CBOR_PRIVATE_API CborError _cbor_value_dup_string(const CborValue *value, void **buffer,
                                                   size_t *buflen, CborValue *next);
 
-CBOR_API CborError cbor_value_calculate_string_length(const CborValue *value, size_t *length);
+CBOR_API CborError cbor_value_calculate_string_length(const CborValue *value, size_t *len);
 
 CBOR_INLINE_API CborError cbor_value_copy_text_string(const CborValue *value, char *buffer,
                                                       size_t *buflen, CborValue *next) {
diff --git a/client/tinycbor/cborparser.c b/client/tinycbor/cborparser.c
index 23e87f98a..2dade3a0d 100644
--- a/client/tinycbor/cborparser.c
+++ b/client/tinycbor/cborparser.c
@@ -208,7 +208,6 @@ static bool is_fixed_type(uint8_t type) {
 
 static CborError preparse_value(CborValue *it) {
     const CborParser *parser = it->parser;
-    it->type = CborInvalidType;
 
     /* are we at the end? */
     if (it->ptr == parser->end)