adjust validation to ruby2.0 and to client-API changes