Fix data-service.php and ValidatorArrayModel.php