Add fixes to arena system