Add fixes to arena plugin