Fixed format bugs