Fixing validation errors

Fixing validation errors