Address formatting and other issues