Fixed some more validator issues