More medic fixes