Fixup a few remaining String issues