Fix some format issues.