Fix some of the audit trail issues when running under cassandra