data type fixes