Validation Errors fixed