Wildcard improvements.