More type fixes, insert sytnax