Repair Some Issues