Fixed Validation errors