Some wildcard fixes.