minor fixes for wildcard