add some more type fixes