Fixed broken formatters