Bug fixes and support for manually added dependencies