Quick type fixes