More string fixes