Minor typo and type fixes