Adjust defaults to newer DDT versions