Stupid format tweaks