added a couple type fixes