const/type fixes.