-Bus fixes