Various bugfixes and small improvements in DependencyAnalyzer