Correct bugs in draw.