diff --git a/external/rapidjson b/external/rapidjson
index 129d19ba7..67fac85e9 160000
--- a/external/rapidjson
+++ b/external/rapidjson
@@ -1 +1 @@
-Subproject commit 129d19ba7f496df5e33658527a7158c79b99c21c
+Subproject commit 67fac85e96220f69076121d569abd15471abb6bf
diff --git a/external/unbound b/external/unbound
index d3724dfa5..7f2396795 160000
--- a/external/unbound
+++ b/external/unbound
@@ -1 +1 @@
-Subproject commit d3724dfa553429d368c27aef160f02f5e8b8075f
+Subproject commit 7f23967954736dcaa366806b9eaba7e2bdfede11
diff --git a/src/rpc/daemon_messages.h b/src/rpc/daemon_messages.h
index be3138e3b..bb05b45fa 100644
--- a/src/rpc/daemon_messages.h
+++ b/src/rpc/daemon_messages.h
@@ -62,7 +62,7 @@ class classname \
 #define END_RPC_MESSAGE_RESPONSE };
 #define END_RPC_MESSAGE_CLASS };
 
-#define COMMA() ,
+#define COMMA ,
 
 // NOTE: when using a type with multiple template parameters,
 // replace any comma in the template specifier with the macro
@@ -118,7 +118,7 @@ BEGIN_RPC_MESSAGE_CLASS(GetTransactions);
     RPC_MESSAGE_MEMBER(std::vector<crypto::hash>, tx_hashes);
   END_RPC_MESSAGE_REQUEST;
   BEGIN_RPC_MESSAGE_RESPONSE;
-    RPC_MESSAGE_MEMBER(std::unordered_map<crypto::hash COMMA() cryptonote::rpc::transaction_info>, txs);
+    RPC_MESSAGE_MEMBER(std::unordered_map<crypto::hash COMMA cryptonote::rpc::transaction_info>, txs);
     RPC_MESSAGE_MEMBER(std::vector<crypto::hash>, missed_hashes);
   END_RPC_MESSAGE_RESPONSE;
 END_RPC_MESSAGE_CLASS;
diff --git a/tests/data/wallet_testnet.keys b/tests/data/wallet_testnet.keys
index 032e0599f..dd3ca90ed 100755
Binary files a/tests/data/wallet_testnet.keys and b/tests/data/wallet_testnet.keys differ