Pull in these type fixes.