Additions to the menu fixes.