A few string fixes