Building fixes

End of work with the validator (for now)