basic type fixes