Runtime type fixes