GH: Arena super duper fixes!