Document fix-up results.
Merge branch 'fix-up'