Various bus fixes.