Plan MD fixes