Final bus fixes