CDK-546: Fixed some classpath issues.