syntax + type fixes