diff --git a/src/Contract.cpp b/src/Contract.cpp
index 5b94761..e7eaca5 100644
--- a/src/Contract.cpp
+++ b/src/Contract.cpp
@@ -283,7 +283,7 @@ string Contract::GenerateBytesForString(const string *value)
 {
     const char *valuePtr = value->c_str(); //don't fail if given a 'String'
     size_t length = strlen(valuePtr);
-    return GenerateBytesForBytes(valuePtr, length);
+    return GenerateBytesForInt(length) + GenerateBytesForBytes(valuePtr, length);
 }
 
 string Contract::GenerateBytesForHexBytes(const string *value)
diff --git a/src/KeyID.h b/src/KeyID.h
index 1b4f924..826dcdd 100644
--- a/src/KeyID.h
+++ b/src/KeyID.h
@@ -1,8 +1,8 @@
 #ifndef KEY_ID_H
 #define KEY_ID_H
 #include "EEPROM.h"
-#include <web3.h>
-#include <trezor/rand.h>
+#include <Web3.h>
+#include <Trezor/rand.h>
 #include <string>
 #include <Crypto.h>