* validator_discovery: simplification * compilation fixes * compilation fixes II * compilation fixes III * compilation fixes IV
