CDK-378: Fixes after review