Add minor changes to arena plugin