Many type fixes