Fix: compatibility with new menu manager