Some minor type fixes.