Fix some breaking stuff with bus width