Fix formatting oddities