Fixing string conditionals