Update fields and fix formatter.