Medic fixes