408042 editable working set name, other fixes

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>