Fix more uninitialized reads