Fix version D3 problems