Fix the last few format arg missmatches I missed.