Fixed a few small bus