Fix one fault at a time

The maf on these are extremely common to fail, and also dont always throw up a code.