diff --git a/src/gpio.rs b/src/gpio.rs
index fc4fe7a..6bcd0d7 100644
--- a/src/gpio.rs
+++ b/src/gpio.rs
@@ -103,12 +103,14 @@ impl<MODE> OutputPin for Pin<Output<MODE>> {
 
     #[inline(always)]
     fn set_high(&mut self) -> Result<(), Self::Error> {
-        Ok(unsafe { (*self.port).set_high(self.i) })
+        unsafe { (*self.port).set_high(self.i) };
+        Ok(())
     }
 
     #[inline(always)]
     fn set_low(&mut self) -> Result<(), Self::Error> {
-        Ok(unsafe { (*self.port).set_low(self.i) })
+        unsafe { (*self.port).set_low(self.i) }
+        Ok(())
     }
 }
 
diff --git a/src/spi.rs b/src/spi.rs
index 6668ea0..8d31fd8 100644
--- a/src/spi.rs
+++ b/src/spi.rs
@@ -40,8 +40,6 @@
 use core::marker::PhantomData;
 use core::{ops::Deref, ptr};
 
-use nb;
-
 pub use embedded_hal::spi::{Mode, Phase, Polarity};
 
 // TODO Put this inside the macro
diff --git a/src/timers.rs b/src/timers.rs
index 85e75fb..ecd243c 100644
--- a/src/timers.rs
+++ b/src/timers.rs
@@ -35,7 +35,6 @@ use crate::rcc::{Clocks, Rcc};
 
 use crate::time::Hertz;
 use embedded_hal::timer::{CountDown, Periodic};
-use nb;
 use void::Void;
 
 /// Hardware timers