Fixed some specificity issues