Possibly more type fixes.