Small fixes in the Formatters