Add lots of fixes to the arena plugin