Some medi changes / fixes