fix several dependency divergence issues
Merge pull request #56 from adennie/fix-dependency-issues

fix several dependency divergence issues