Merge some useful changes from MD