Some small fixes on DependencyBuilder...