Audit log fixes

For feedback coming from QA