Corrected some formats