Minor tables and type fixes