Fix arenamanager issues