Add major fixes to the arena plugin