fix several dependency divergence issues