Fix bugs for DO prototype.