A few more format fixes