Recovering first sources
Fixed validator problems
Resolve version problems