Moved the QD fixes to a patch file since there were so many current and previous changes that were needed. Hopefully these will make it into the next release of QD.