Fix up string types