menu-related bug fixes