Add some wishbone checking