Some fixes for menus.