Fixed validator problems