Fix more compile errors.