Fix more initialization bugs