Fix problems with empty strings.