Fixed few formats