fixed validation issues
Fixed validation errors