small fixes for the Criteria class