Add important fixes to the arena plugin