GUI-649 reduced CLC calls on several operations. Fixed a couple of bugs ...

...in the process