Improve and fix only-d3 version