More string fixes.