bus: reorder a few things