contextmenu fixes