some context menu fixes