Fix two logic errors with strs