Reply type fixes