Fix some dead stores reported by CLANG