More type fixes and new numbers.