Fix up more string types