More string type fixes