[RFC PATCH 0/4] Assorted audit fixes/improvements