Pull request for arbitrary fixes

Yay further arbitration!