Fix formats for 2.6