Fix bus map errors