diff --git a/TestVectors/dafny/TestVectors/src/EsdkTestManifests.dfy b/TestVectors/dafny/TestVectors/src/EsdkTestManifests.dfy
index 3fcd13ce5..50b1bd081 100644
--- a/TestVectors/dafny/TestVectors/src/EsdkTestManifests.dfy
+++ b/TestVectors/dafny/TestVectors/src/EsdkTestManifests.dfy
@@ -248,8 +248,7 @@ module {:options "-functionSyntax:4"} EsdkTestManifests {
             ==>
               SupportedEncryptVersion?(manifestData.value.version)
   {
-    var decryptManifestBv :- FileIO.ReadBytesFromFile(manifestPath + manifestFileName);
-    var decryptManifestBytes := BvToBytes(decryptManifestBv);
+    var decryptManifestBytes :- FileIO.ReadBytesFromFile(manifestPath + manifestFileName);
     var manifestJson :- API.Deserialize(decryptManifestBytes)
     .MapFailure(( e: Errors.DeserializationError ) => e.ToString());
     :- Need(manifestJson.Object?, "Not a JSON object");
diff --git a/TestVectors/dafny/TestVectors/src/EsdkTestVectors.dfy b/TestVectors/dafny/TestVectors/src/EsdkTestVectors.dfy
index 8e5032ef7..5496291de 100644
--- a/TestVectors/dafny/TestVectors/src/EsdkTestVectors.dfy
+++ b/TestVectors/dafny/TestVectors/src/EsdkTestVectors.dfy
@@ -542,14 +542,12 @@ module {:options "-functionSyntax:4"} EsdkTestVectors {
   method ReadVectorsFile(location: string)
     returns (output: Result<seq<uint8>, string>)
   {
-    var fileBv :- FileIO.ReadBytesFromFile(location);
-    output := Success(BvToBytes(fileBv));
+    output := FileIO.ReadBytesFromFile(location);
   }
 
   method WriteVectorsFile(location: string, bytes: seq<uint8>)
     returns (output: Result<(), string>)
   {
-    var bv := BytesBv(bytes);
-    output := FileIO.WriteBytesToFile(location, bv);
+    output := FileIO.WriteBytesToFile(location, bytes);
   }
 }
\ No newline at end of file
diff --git a/TestVectors/dafny/TestVectors/src/WriteVectors.dfy b/TestVectors/dafny/TestVectors/src/WriteVectors.dfy
index 38ce10462..6edb266c5 100644
--- a/TestVectors/dafny/TestVectors/src/WriteVectors.dfy
+++ b/TestVectors/dafny/TestVectors/src/WriteVectors.dfy
@@ -108,11 +108,10 @@ module {:options "-functionSyntax:4"} WriteVectors {
     );
 
     var esdkEncryptManifestBytes :- expect API.Serialize(esdkEncryptManifests);
-    var esdkEncryptManifestBv := JSONHelpers.BytesBv(esdkEncryptManifestBytes);
 
     var _ :- expect FileIO.WriteBytesToFile(
       op.encryptManifestOutput + "encrypt-manifest.json",
-      esdkEncryptManifestBv
+      esdkEncryptManifestBytes
     );
 
     output := Success(());
@@ -155,11 +154,10 @@ module {:options "-functionSyntax:4"} WriteVectors {
     );
 
     var esdkDecryptManifestBytes :- expect API.Serialize(esdkDecryptManifest);
-    var esdkDecryptManifestBv := JSONHelpers.BytesBv(esdkDecryptManifestBytes);
 
     var _ :- expect FileIO.WriteBytesToFile(
       op.decryptManifestOutput + "manifest.json",
-      esdkDecryptManifestBv
+      esdkDecryptManifestBytes
     );
 
     output := Success(());
diff --git a/libraries b/libraries
index 05beef6e2..418de0c6a 160000
--- a/libraries
+++ b/libraries
@@ -1 +1 @@
-Subproject commit 05beef6e25a5583abdd4c70c6b09404dfe2fb4cb
+Subproject commit 418de0c6a911789709d975039b7ead468ee76cc7
diff --git a/mpl b/mpl
index aa2bed1f0..80e28f3f7 160000
--- a/mpl
+++ b/mpl
@@ -1 +1 @@
-Subproject commit aa2bed1f0f9fbc48503870fe1b500a6aac59b130
+Subproject commit 80e28f3f7816e99ed22120cca6a81628a3ae4892