Fix more errors.