A few more fixes for format.