More arbiter fixes.