Fixed more format issues.