Some formats tweaks