Add small bug fixes to arena plugin