fixed minor errors related to new validation (thanks @cmfcmf)