More productivity bus tweaks