Address audit changes

Follow-up for picodata!750 (merged) and !201 (merged)