More type fixes