fixed a few dependency resolution issues