Fix issues if initial Audit Commit