Replace deprecated calls in validators