diff --git a/lpcperipheral/io_space.py b/lpcperipheral/io_space.py
index 6f4a32e..56b2778 100644
--- a/lpcperipheral/io_space.py
+++ b/lpcperipheral/io_space.py
@@ -13,23 +13,22 @@ class IOSpace(Elaboratable):
                  bmc_lpc_ctrl_addr=0x2000,
                  target_vuart_addr=0x3f8, target_ipmi_addr=0xe4):
         self.vuart_depth = vuart_depth
-        # BMC wishbone is 32 bit wide, so divide addresses by 4
-        self.bmc_vuart_addr = bmc_vuart_addr // 4
-        self.bmc_ipmi_addr = bmc_ipmi_addr // 4
-        self.bmc_lpc_ctrl_addr = bmc_lpc_ctrl_addr // 4
+        self.bmc_vuart_addr = bmc_vuart_addr
+        self.bmc_ipmi_addr = bmc_ipmi_addr
+        self.bmc_lpc_ctrl_addr = bmc_lpc_ctrl_addr
         self.target_vuart_addr = target_vuart_addr
         self.target_ipmi_addr = target_ipmi_addr
 
         self.bmc_vuart_irq = Signal()
         self.bmc_ipmi_irq = Signal()
-        self.bmc_wb = WishboneInterface(addr_width=14, data_width=8)
+        self.bmc_wb = WishboneInterface(addr_width=14, data_width=32, granularity=8)
+
+        self.lpc_ctrl_wb = WishboneInterface(addr_width=3, data_width=32, granularity=8)
 
         self.target_vuart_irq = Signal()
         self.target_ipmi_irq = Signal()
         self.target_wb = WishboneInterface(addr_width=16, data_width=8, features=["err"])
 
-        self.lpc_ctrl_wb = WishboneInterface(addr_width=3, data_width=8)
-
         self.error_wb = WishboneInterface(addr_width=2, data_width=8,
                                           features=["err"])
 
@@ -40,18 +39,18 @@ class IOSpace(Elaboratable):
         m.submodules.ipmi_bt = ipmi_bt = IPMI_BT()
 
         # BMC address decode
-        m.submodules.bmc_decode = bmc_decode = WishboneDecoder(addr_width=14, data_width=8, granularity=8)
+        m.submodules.bmc_decode = bmc_decode = WishboneDecoder(addr_width=14, data_width=32, granularity=8)
 
         bmc_ipmi_bus = ipmi_bt.bmc_wb
-        bmc_ipmi_bus.memory_map = MemoryMap(addr_width=3, data_width=8)
+        bmc_ipmi_bus.memory_map = MemoryMap(addr_width=5, data_width=8)
         bmc_decode.add(bmc_ipmi_bus, addr=self.bmc_ipmi_addr)
 
         bmc_vuart_bus = vuart_joined.wb_a
-        bmc_vuart_bus.memory_map = MemoryMap(addr_width=3, data_width=8)
+        bmc_vuart_bus.memory_map = MemoryMap(addr_width=5, data_width=8)
         bmc_decode.add(bmc_vuart_bus, addr=self.bmc_vuart_addr)
 
         lpc_ctrl_bus = self.lpc_ctrl_wb
-        lpc_ctrl_bus.memory_map = MemoryMap(addr_width=3, data_width=8)
+        lpc_ctrl_bus.memory_map = MemoryMap(addr_width=5, data_width=8)
         bmc_decode.add(lpc_ctrl_bus, addr=self.bmc_lpc_ctrl_addr)
 
         m.d.comb += [
diff --git a/lpcperipheral/ipmi_bt.py b/lpcperipheral/ipmi_bt.py
index 2d6c353..c374852 100644
--- a/lpcperipheral/ipmi_bt.py
+++ b/lpcperipheral/ipmi_bt.py
@@ -38,7 +38,7 @@ class IPMI_BT(Elaboratable):
     def __init__(self, depth=64):
         self.depth = depth
 
-        self.bmc_wb = WishboneInterface(data_width=8, addr_width=3)
+        self.bmc_wb = WishboneInterface(data_width=32, addr_width=3, granularity=8)
         self.bmc_irq = Signal()
 
         self.target_wb = WishboneInterface(data_width=8, addr_width=2)
diff --git a/lpcperipheral/lpcperipheral.py b/lpcperipheral/lpcperipheral.py
index a492a09..e2cb028 100644
--- a/lpcperipheral/lpcperipheral.py
+++ b/lpcperipheral/lpcperipheral.py
@@ -26,8 +26,8 @@ class LPCPeripheral(Elaboratable):
         # BMC wishbone. We dont use a Record because we want predictable
         # signal names so we can hook it up to VHDL/Verilog
         self.adr = Signal(14)
-        self.dat_w = Signal(8)
-        self.dat_r = Signal(8)
+        self.dat_w = Signal(32)
+        self.dat_r = Signal(32)
         self.sel = Signal()
         self.cyc = Signal()
         self.stb = Signal()
diff --git a/lpcperipheral/vuart_joined.py b/lpcperipheral/vuart_joined.py
index 5e85c1d..a9648e6 100644
--- a/lpcperipheral/vuart_joined.py
+++ b/lpcperipheral/vuart_joined.py
@@ -21,10 +21,10 @@ class VUartJoined(Elaboratable):
         self.depth = depth
 
         self.irq_a = Signal()
-        self.wb_a = WishboneInterface(data_width=8, addr_width=3)
+        self.wb_a = WishboneInterface(data_width=32, addr_width=3, granularity=8)
 
         self.irq_b = Signal()
-        self.wb_b = WishboneInterface(data_width=8, addr_width=3)
+        self.wb_b = WishboneInterface(data_width=8, addr_width=3, granularity=8)
 
     def elaborate(self, platform):
         m = Module()