GH: More fixes to the arena