Get fixes from dwalk branch.