Wildcard fixes