Dependency check code improvements