Fixed MD issues