Fix some minor context menu issues