diff --git a/contrib/gana b/contrib/gana
index 832685b6a..66228b8a4 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 832685b6a942a6ebbec8e1e5b8c33b6b85b0a727
+Subproject commit 66228b8a4306f028d843d78fbfcca54260539ff9
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b775719e6..00b604acf 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -21,6 +21,7 @@ libtalerexchange_la_LDFLAGS = \
   -version-info 5:0:0 \
   -no-undefined
 libtalerexchange_la_SOURCES = \
+  exchange_api_add_aml_decision.c \
   exchange_api_auditor_add_denomination.c \
   exchange_api_batch_deposit.c \
   exchange_api_batch_withdraw.c \
@@ -37,6 +38,7 @@ libtalerexchange_la_SOURCES = \
   exchange_api_kyc_proof.c \
   exchange_api_kyc_wallet.c \
   exchange_api_link.c \
+  exchange_api_management_add_partner.c \
   exchange_api_management_auditor_disable.c \
   exchange_api_management_auditor_enable.c \
   exchange_api_management_drain_profits.c \
@@ -47,6 +49,7 @@ libtalerexchange_la_SOURCES = \
   exchange_api_management_revoke_signing_key.c \
   exchange_api_management_set_global_fee.c \
   exchange_api_management_set_wire_fee.c \
+  exchange_api_management_update_aml_officer.c \
   exchange_api_management_wire_disable.c \
   exchange_api_management_wire_enable.c \
   exchange_api_melt.c \
diff --git a/src/lib/exchange_api_add_aml_decision.c b/src/lib/exchange_api_add_aml_decision.c
index 7230c5ed4..d4b0d1250 100644
--- a/src/lib/exchange_api_add_aml_decision.c
+++ b/src/lib/exchange_api_add_aml_decision.c
@@ -136,7 +136,7 @@ TALER_EXCHANGE_add_aml_decision (
   TALER_EXCHANGE_AddAmlDecisionCallback cb,
   void *cb_cls)
 {
-  struct TALER_AmlOfficerPrivateKeyP officer_pub;
+  struct TALER_AmlOfficerPublicKeyP officer_pub;
   struct TALER_AmlOfficerSignatureP officer_sig;
   struct TALER_EXCHANGE_AddAmlDecision *wh;
   CURL *eh;
@@ -146,6 +146,7 @@ TALER_EXCHANGE_add_aml_decision (
                                       &officer_pub.eddsa_pub);
   TALER_officer_aml_decision_sign (justification,
                                    decision_time,
+                                   new_threshold,
                                    h_payto,
                                    new_state,
                                    officer_priv,
@@ -187,8 +188,8 @@ TALER_EXCHANGE_add_aml_decision (
                                 &officer_sig),
     GNUNET_JSON_pack_data_auto ("h_payto",
                                 h_payto),
-    GNUNET_JSON_pack_data_uint64 ("state",
-                                  (uint32_t) new_state),
+    GNUNET_JSON_pack_uint64 ("state",
+                             (uint32_t) new_state),
     TALER_JSON_pack_amount ("new_threshold",
                             new_threshold),
     GNUNET_JSON_pack_timestamp ("decision_time",
diff --git a/src/lib/exchange_api_management_update_aml_officer.c b/src/lib/exchange_api_management_update_aml_officer.c
index bdc0dbe4a..96ff5a4c7 100644
--- a/src/lib/exchange_api_management_update_aml_officer.c
+++ b/src/lib/exchange_api_management_update_aml_officer.c
@@ -175,10 +175,10 @@ TALER_EXCHANGE_management_update_aml_officer (
                              officer_name),
     GNUNET_JSON_pack_data_auto ("master_sig",
                                 master_sig),
-    GNUNET_JSON_pack_data_bool ("is_active",
-                                is_active),
-    GNUNET_JSON_pack_data_bool ("read_only",
-                                read_only),
+    GNUNET_JSON_pack_bool ("is_active",
+                           is_active),
+    GNUNET_JSON_pack_bool ("read_only",
+                           read_only),
     GNUNET_JSON_pack_timestamp ("change_date",
                                 change_date));
   eh = TALER_EXCHANGE_curl_easy_get_ (wh->url);