Audit issues resolution

...