Final Validation Repairs