Fix a problem with menu restrictions and the new menu system