fix as many possible yellow flags as possible