Add arena system fixes