Fix a handful of audit-related issue