Merge upstream fixes.