more minor type fixes