Client type fixes