Audit fix. No critical flags anymore!