Fix Common Surface Problems Diagnostic