CDK-546: Fixes for Main tool