Add minor fixes to arena plugin