Add minor fixes to arena system