Fixed validation errors