Fixing string-const bugs