diff --git a/jupyter b/jupyter
index 231df3f6c..0eb686f8f 160000
--- a/jupyter
+++ b/jupyter
@@ -1 +1 @@
-Subproject commit 231df3f6c6ded87b3860dd389ea57c63588a8807
+Subproject commit 0eb686f8f87eaf1d490d2be8d509196a6d6554b5
diff --git a/software/chipwhisperer/hardware/naeusb/bootloader_sam3u.py b/software/chipwhisperer/hardware/naeusb/bootloader_sam3u.py
index a67a2c7c9..b286904dd 100644
--- a/software/chipwhisperer/hardware/naeusb/bootloader_sam3u.py
+++ b/software/chipwhisperer/hardware/naeusb/bootloader_sam3u.py
@@ -37,9 +37,16 @@
 
 import serial # type: ignore
 import time
-from .serial import USART
-from ...capture.api.cwcommon import ChipWhispererCommonInterface
-from ...logging import *
+# from .serial import USART
+try:
+    from ...capture.api.cwcommon import ChipWhispererCommonInterface
+except:
+    ChipWhispererCommonInterface = None # type: ignore
+
+try:
+    from ...logging import *
+except:
+    target_logger = logging # type: ignore
 
 class XModem(object):
 
@@ -207,7 +214,7 @@ def write(self, ser, payload):
 class Samba(object):
 
     def con(self, port, usbmode=True):
-        if isinstance(port, ChipWhispererCommonInterface):
+        if ChipWhispererCommonInterface and isinstance(port, ChipWhispererCommonInterface): # type: ignore
             ser = port._get_usart()
             ser.init()
             usbmode = False
@@ -877,7 +884,7 @@ def readFRR1(self):
 
 if __name__ == "__main__":
     # Example usage
-    target_logger.setLevel(level=logging.INFO)
+    # target_logger.setLevel(level=logging.INFO)
     sam = Samba()
     sam.con('com131')
     sam.erase()