Some type fixes.