Fixed moooooore validator issues