Small type fixes