diff --git a/src/source.c b/src/source.c
index b8bb22e7..02bfc74e 100644
--- a/src/source.c
+++ b/src/source.c
@@ -940,6 +940,8 @@ static void source_apply_mount (source_t *source, mount_proxy *mountinfo)
 
     DEBUG1("Applying mount information for \"%s\"", source->mount);
     avl_tree_rlock (source->client_tree);
+    stats_event_args (source->mount, "listener_peak", "%lu", source->peak_listeners);
+
     if (mountinfo)
     {
         source->max_listeners = mountinfo->max_listeners;
diff --git a/src/yp.c b/src/yp.c
index c9a19422..4470d47b 100644
--- a/src/yp.c
+++ b/src/yp.c
@@ -246,6 +246,8 @@ void yp_recheck_config (ice_config_t *config)
                 destroy_yp_server (server);
                 break;
             }
+            if (server->url_timeout > 10 || server->url_timeout < 1)
+                server->url_timeout = 6;
             if (server->touch_interval < 30)
                 server->touch_interval = 30;
             curl_easy_setopt (server->curl, CURLOPT_USERAGENT, server->server_id);
@@ -386,6 +388,8 @@ static int do_yp_add (ypdata_t *yp, char *s, unsigned len)
     free (value);
 
     value = stats_get_value (yp->mount, "bitrate");
+    if (value == NULL)
+        value = stats_get_value (yp->mount, "ice-bitrate");
     add_yp_info (yp, value, YP_BITRATE);
     free (value);