More build fixes.
More type fixes.