Minor type fixes.