Validation issue fixes

Signed-off-by: vinish <vinish@zhservices.com>