Re: Audit fixes for v4.11 (#1)