Fixed validator issues