Minor MPDC fixes