Building fixes

Fixes (validator use)