diff --git a/src/configfile.c b/src/configfile.c
index 40137e4d..972504ea 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -253,7 +253,7 @@ int config_existdir(char *path) {
 void config_subst_stream(WS_CONNINFO *pwsc, int fd_src) {
     int in_arg;
     char *argptr;
-    char argbuffer[80];
+    char argbuffer[256];
     char next;
     CONFIGELEMENT *pce;
     char *first, *last;
diff --git a/src/dispatch.c b/src/dispatch.c
index 62694d79..6ce59f6d 100644
--- a/src/dispatch.c
+++ b/src/dispatch.c
@@ -1187,7 +1187,6 @@ void dispatch_browse(WS_CONNINFO *pwsc, DBQUERYINFO *pqi) {
         DPRINTF(E_WARN,L_DAAP|L_BROW,"Invalid browse request type %s\n",pqi->uri_sections[3]);
         ws_returnerror(pwsc,404,"Invalid browse type");
         config_set_status(pwsc,pqi->session_id,NULL);
-        free(pqi);
         return;
     }
 
@@ -1427,7 +1426,6 @@ void dispatch_dbinfo(WS_CONNINFO *pwsc, DBQUERYINFO *pqi) {
 
 void dispatch_logout(WS_CONNINFO *pwsc, DBQUERYINFO *pqi) {
     config_set_status(pwsc,pqi->session_id,NULL);
-    free(pqi);
     ws_returnerror(pwsc,204,"Logout Successful");
 }