ContextMenu fixes.