Small string fixes