context menu fixes