Fixes for Audittrail