Audit fixes