Don't append base local path too early
Use same resolver for dependencies

Fixes #1469