Fix some String issues