some Medic fixes