Assignment type fixes