Yet more MD changes....