Fix project dependency management

As discussed on the issue you've reported.