Fixed Errors found in Validation