Some fixes for audit