Add fixes to last commit to arena plugin