Add fixes for arena plugin