fixing failures after last CDK conventions change