File format tweaks