Fix menu-refresh issues.