Fix more warnings.