Add bug fixes to arena system