Fix MDI issues.