Minor specificity fixes