Validation

Fixes validation issues