More MD tweaks