Fix center

One change per root cause, ordered by findings resolved. Fix the cause, not the symptom.