Updates to work with new non-blocking MenuSystem.