* Propagating some more fixes from the D7 branch.