Add minor changes to arena system