FIX corrections for changed Bus class