Validation error fixes