[bug 1035319] More fixes.