type fixes
merge