2 files changed, 2 insertions, 3 deletions

diff --git a/src/service/fs/fs_api.c b/src/service/fs/fs_api.c
index 627c58004..65646c7eb 100644
--- a/src/service/fs/fs_api.c
+++ b/src/service/fs/fs_api.c
@@ -3264,7 +3264,7 @@ GNUNET_FS_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
     GNUNET_TIME_UNIT_MINUTES; /* conservative starting point */
   va_start (ap, flags);
   while (GNUNET_FS_OPTIONS_END !=
-         (opt = GNUNET_VA_ARG_ENUM (ap, GNUNET_FS_OPTIONS)))
+         (opt = ((enum GNUNET_FS_OPTIONS) va_arg (ap, int))))
   {
     switch (opt)
     {
diff --git a/src/service/fs/gnunet-service-fs_cp.c b/src/service/fs/gnunet-service-fs_cp.c
index 74dd42daf..b2b73d0a5 100644
--- a/src/service/fs/gnunet-service-fs_cp.c
+++ b/src/service/fs/gnunet-service-fs_cp.c
@@ -1610,8 +1610,7 @@ GSF_connected_peer_done_ ()
   fr_task = NULL;
   GNUNET_CONTAINER_multipeermap_destroy (cp_map);
   cp_map = NULL;
-  GNUNET_PEERSTORE_disconnect (peerstore,
-                               GNUNET_YES);
+  GNUNET_PEERSTORE_disconnect (peerstore);
 }