Fix more warnings from sanity checker