Fixes to arena and router