Fixes made for validation.