Minor fixes of String