Formatting and string type fixes