Audit feedback fixes