Fix a couple of string set problems.