WIP - ArenaBootstrap fix