type fixes