Context Editing fixes

Couple of fixes around processor actions when editing Contexts. See commits for details.