Fix format problems