Constant type fixes.