Some more format fixes