diff --git a/src/blobstore/implementations/onblocks/datatreestore/DataTree.cpp b/src/blobstore/implementations/onblocks/datatreestore/DataTree.cpp
index 682ff062..530d5a24 100644
--- a/src/blobstore/implementations/onblocks/datatreestore/DataTree.cpp
+++ b/src/blobstore/implementations/onblocks/datatreestore/DataTree.cpp
@@ -149,7 +149,7 @@ uint32_t DataTree::_numLeaves(const DataNode &node) const {
   }
 
   const DataInnerNode &inner = dynamic_cast<const DataInnerNode&>(node);
-  uint64_t numLeavesInLeftChildren = (inner.numChildren()-1) * leavesPerFullChild(inner);
+  uint64_t numLeavesInLeftChildren = (uint64_t)(inner.numChildren()-1) * leavesPerFullChild(inner);
   auto lastChild = _nodeStore->load(inner.LastChild()->key());
   ASSERT(lastChild != none, "Couldn't load last child");
   uint64_t numLeavesInRightChild = _numLeaves(**lastChild);
diff --git a/src/cryfs/config/crypto/inner/InnerEncryptor.h b/src/cryfs/config/crypto/inner/InnerEncryptor.h
index 800dd994..b4e24506 100644
--- a/src/cryfs/config/crypto/inner/InnerEncryptor.h
+++ b/src/cryfs/config/crypto/inner/InnerEncryptor.h
@@ -12,6 +12,7 @@
 namespace cryfs {
     class InnerEncryptor {
     public:
+        virtual ~InnerEncryptor() {}
         virtual InnerConfig encrypt(const cpputils::Data &plaintext) const = 0;
         virtual boost::optional<cpputils::Data> decrypt(const InnerConfig &innerConfig) const = 0;
     };