diff --git a/CMakeLists.txt b/CMakeLists.txt
index b1d0ccb..c03cb47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,7 +53,8 @@
 
 find_package(PkgConfig)
 pkg_check_modules(LIBYANG REQUIRED libyang-cpp>=0.15.111)
-pkg_check_modules(SYSREPO REQUIRED libSysrepo-cpp>=0.7.3)
+# TODO: bump to 0.7.8 once it is tagged
+pkg_check_modules(SYSREPO REQUIRED libSysrepo-cpp>=0.7.7)
 
 # we don't need filename tracking, and we prefer to use header-only Boost
 add_definitions(-DBOOST_SPIRIT_X3_NO_FILESYSTEM)
diff --git a/src/datastore_access.hpp b/src/datastore_access.hpp
index 9cd6a70..7972523 100644
--- a/src/datastore_access.hpp
+++ b/src/datastore_access.hpp
@@ -8,6 +8,7 @@
 
 #pragma once
 
+#include <map>
 #include <string>
 #include "ast_values.hpp"
 
diff --git a/src/sysrepo_access.cpp b/src/sysrepo_access.cpp
index 57d1cb3..5c80bbc 100644
--- a/src/sysrepo_access.cpp
+++ b/src/sysrepo_access.cpp
@@ -48,22 +48,8 @@
         return std::make_shared<sysrepo::Val>(value.c_str());
     }
 
-    sysrepo::S_Val operator()(const uint32_t& value) const
-    {
-        return std::make_shared<sysrepo::Val>(value, SR_UINT32_T);
-    }
-
-    sysrepo::S_Val operator()(const int32_t& value) const
-    {
-        return std::make_shared<sysrepo::Val>(value, SR_INT32_T);
-    }
-
-    sysrepo::S_Val operator()(const bool& value) const
-    {
-        return std::make_shared<sysrepo::Val>(value, SR_BOOL_T);
-    }
-
-    sysrepo::S_Val operator()(const double& value) const
+    template <typename T>
+    sysrepo::S_Val operator()(const T& value) const
     {
         return std::make_shared<sysrepo::Val>(value);
     }
diff --git a/submodules/libyang b/submodules/libyang
index ebf761d..1a5a4ee 160000
--- a/submodules/libyang
+++ b/submodules/libyang
@@ -1 +1 @@
-Subproject commit ebf761dfe2549ec28aac7a62c0c2deeb5395466f
+Subproject commit 1a5a4ee461b21d7429d607a04176a5d06625cdb7
diff --git a/submodules/sysrepo b/submodules/sysrepo
index 9fac488..fbbd0e6 160000
--- a/submodules/sysrepo
+++ b/submodules/sysrepo
@@ -1 +1 @@
-Subproject commit 9fac488d44b22e36d4d74dd19f43b4c041cc2b3e
+Subproject commit fbbd0e6bdf58f88f92d5cfae148714f29d68d11b