Fixes following CDK-514.