diff --git a/shared-bindings/busdevice/SPIDevice.c b/shared-bindings/busdevice/SPIDevice.c
index 4c633b4fd4..631d0eec49 100644
--- a/shared-bindings/busdevice/SPIDevice.c
+++ b/shared-bindings/busdevice/SPIDevice.c
@@ -103,7 +103,7 @@ STATIC mp_obj_t busdevice_spidevice_make_new(const mp_obj_type_t *type, size_t n
 STATIC mp_obj_t busdevice_spidevice_obj___enter__(mp_obj_t self_in) {
     busdevice_spidevice_obj_t *self = MP_OBJ_TO_PTR(self_in);
     common_hal_busdevice_spidevice_enter(self);
-    return self;
+    return self->spi;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_1(busdevice_spidevice___enter___obj, busdevice_spidevice_obj___enter__);
 
diff --git a/shared-bindings/busdevice/__init__.c b/shared-bindings/busdevice/__init__.c
index 391d3698a8..6e6ede532f 100644
--- a/shared-bindings/busdevice/__init__.c
+++ b/shared-bindings/busdevice/__init__.c
@@ -33,6 +33,7 @@
 
 #include "shared-bindings/busdevice/__init__.h"
 #include "shared-bindings/busdevice/I2CDevice.h"
+#include "shared-bindings/busdevice/SPIDevice.h"
 
 
 //| """Hardware accelerated external bus access
@@ -46,6 +47,7 @@
 STATIC const mp_rom_map_elem_t busdevice_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_busdevice) },
     { MP_ROM_QSTR(MP_QSTR_I2CDevice),   MP_ROM_PTR(&busdevice_i2cdevice_type) },
+    { MP_ROM_QSTR(MP_QSTR_SPIDevice),   MP_ROM_PTR(&busdevice_spidevice_type) },
 };
 
 STATIC MP_DEFINE_CONST_DICT(busdevice_module_globals, busdevice_module_globals_table);
diff --git a/shared-module/busdevice/I2CDevice.c b/shared-module/busdevice/I2CDevice.c
index 41706c1a81..b9f8ee25c0 100644
--- a/shared-module/busdevice/I2CDevice.c
+++ b/shared-module/busdevice/I2CDevice.c
@@ -39,8 +39,8 @@ void common_hal_busdevice_i2cdevice_lock(busdevice_i2cdevice_obj_t *self) {
     bool success = false;
     while (!success) {
         success = common_hal_busio_i2c_try_lock(self->i2c);
-        RUN_BACKGROUND_TASKS;
-        mp_handle_pending();
+        //RUN_BACKGROUND_TASKS;
+        //mp_handle_pending();
     }
 }