Merge "Fix API checking for some"