Fix popup menus