fixes for context menu