Fixed some ContextMenu issues.