Add minor fixes to arena