Building fixes

Validator work