Fixed format issues