some type fixes