Minor type fixes