Minor updates, type fixes