cosmetics
type fixes