Fix more 400 errors.