more Format() fixes