A few more patches for Ding.