variable type fixes