diff --git a/sambacc/commands/cli.py b/sambacc/commands/cli.py
index c3721c9..3481633 100644
--- a/sambacc/commands/cli.py
+++ b/sambacc/commands/cli.py
@@ -108,7 +108,7 @@ def _wrapper(f):
         return _wrapper
 
     def assemble(
-        self, arg_func: typing.Callable = None
+        self, arg_func: typing.Optional[typing.Callable] = None
     ) -> argparse.ArgumentParser:
         parser = argparse.ArgumentParser()
         if arg_func is not None:
diff --git a/sambacc/ctdb.py b/sambacc/ctdb.py
index 28cc036..7ff629a 100644
--- a/sambacc/ctdb.py
+++ b/sambacc/ctdb.py
@@ -545,4 +545,4 @@ def __enter__(self) -> CLILeaderStatus:
     def __exit__(
         self, exc_type: ExcType, exc_val: ExcValue, exc_tb: ExcTraceback
     ) -> bool:
-        pass
+        return True