More type fixes.