Few more string fixes from Rohan Garg