Some string fixes