Validation and Model fixes [ci skip]