Some fixes in context menu