Minor QD fixes