diff --git a/src/sandbox.c b/src/sandbox.c
index 4fefbaa..6450776 100644
--- a/src/sandbox.c
+++ b/src/sandbox.c
@@ -178,6 +178,10 @@ sandbox_enter (
 
         // signals
         SCMP_RULE_NOARG(sigaction,       10),
+#ifdef BOOKMARKFS_DEBUG
+        // Make ASAN happy...
+        SCMP_RULE_NOARG(sigaltstack,     0),
+#endif
         SCMP_RULE_NOARG(sigprocmask,     10),
         SCMP_RULE_NOARG(sigreturn,       10),
         SCMP_RULE_NOARG(restart_syscall, 10),
diff --git a/tests/check_watcher.c b/tests/check_watcher.c
index dcd0138..0fe0f1c 100644
--- a/tests/check_watcher.c
+++ b/tests/check_watcher.c
@@ -169,6 +169,7 @@ check_watcher (
       default:
         return -1;
     }
+    argc -= optind;
     if (argc < 1) {
         return -1;
     }