Merge Chris's fixes to 1.4 branch.