little fixes inside validator