tweaks to make the OutputFormat work correctly.