3 files changed, 5 insertions, 3 deletions

diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 1dee73078..9f3587446 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -521,7 +521,7 @@ blacklist ${HOME}/wallet.dat
 blacklist /tmp/akonadi-*
 blacklist /tmp/ssh-*
 
-# ~/.cache directory
+# ${HOME}/.cache directory
 blacklist ${HOME}/.cache/0ad
 blacklist ${HOME}/.cache/8pecxstudios
 blacklist ${HOME}/.cache/Clementine
diff --git a/etc/falkon.profile b/etc/falkon.profile
index cd98d2d65..2f6168e99 100644
--- a/etc/falkon.profile
+++ b/etc/falkon.profile
@@ -15,8 +15,8 @@ include /etc/firejail/disable-passwdmgr.inc
 include /etc/firejail/disable-programs.inc
 
 whitelist ${DOWNLOADS}
-whitelist ~/.cache/falkon
-whitelist ~/.config/falkon
+whitelist ${HOME}/.cache/falkon
+whitelist ${HOME}/.config/falkon
 include /etc/firejail/whitelist-common.inc
 include /etc/firejail/whitelist-var-common.inc
 
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index df6092dff..9cbe6598e 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -950,6 +950,8 @@ void x11_start_xpra_new(int argc, char **argv, char *display_str) {
                 }
         }
 
+        server_argv[spos++] = NULL;
+
         assert((int) fpos < (argc+2));
         assert(!firejail_argv[fpos]);
                                                   // no overrun