Correct handling of the menus on Mac

See title