Small alignment/sign/type fixes