Some fixes in menu-items.