Dependencies, fixing comparisons