Word type fixes