Fixed some formats