Fixed validator bugs.