more type fixes