Various variable type fixes from the new ACR validation tool.