fixes for audit