Small fixes on format