CDK-378: Fixes after review - part 2