Fixed several validation errors