fixes for context menus on issue #749