Fixing string issues