Fix/compatibility envers audited