Downstream fixes.